gtk/gtkclist.h revert includes to how they have been before the

2008-06-03  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkclist.h
	* gtk/gtkctree.h: revert includes to how they have been before the
	GTK_DISABLE_SINGLE_INCLUDES changes. Apparently I missed the fact
	that you can't include <gtk/gtk.h> from two headers where one is a
	parent class of the other and expect them both to be includable
	individually.

svn path=/trunk/; revision=20302

diff --git a/ChangeLog b/ChangeLog
index 60c4091ebbc287ba004a87881180bfb0e3196cdd..576d03fbf6a026bd2e0caff33f64c856595efc10 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-06-03  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkclist.h
+       * gtk/gtkctree.h: revert includes to how they have been before the
+       GTK_DISABLE_SINGLE_INCLUDES changes. Apparently I missed the fact
+       that you can't include <gtk/gtk.h> from two headers where one is a
+       parent class of the other and expect them both to be includable
+       individually.
+
 2008-06-03  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtkprinteroptionset.h: remove newline at beginning of file.

diff --git a/gtk/gtkclist.h b/gtk/gtkclist.h
index 9744119b718b35dafe94117c5178ca92df4362a0..06cbf66ef9068a90e6cba8c9c3f49925885719e8 100644 (file)
--- a/gtk/gtkclist.h
+++ b/gtk/gtkclist.h
@@ -22,7 +22,7 @@
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
 #ifndef GTK_DISABLE_DEPRECATED
@@ -30,7 +30,14 @@
 #ifndef __GTK_CLIST_H__
 #define __GTK_CLIST_H__
 
-#include <gtk/gtk.h>
+#include <gdk/gdk.h>
+#include <gtk/gtksignal.h>
+#include <gtk/gtkalignment.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtkbutton.h>
+#include <gtk/gtkhscrollbar.h>
+#include <gtk/gtkvscrollbar.h>
+#include <gtk/gtkenums.h>
 
 G_BEGIN_DECLS
 
@@ -48,7 +55,7 @@ enum {
   GTK_CLIST_USE_DRAG_ICONS      = 1 <<  8,
   GTK_CLIST_DRAW_DRAG_LINE      = 1 <<  9,
   GTK_CLIST_DRAW_DRAG_RECT      = 1 << 10
-}; 
+};
 
 /* cell types */
 typedef enum

diff --git a/gtk/gtkctree.h b/gtk/gtkctree.h
index 5d4ea5f9e549384bb017e27b5fd4e1abc48d3e5b..e9cabffa7c8005cf10768b0fb559e867b7fa096d 100644 (file)
--- a/gtk/gtkctree.h
+++ b/gtk/gtkctree.h
@@ -25,7 +25,7 @@
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
 #ifndef GTK_DISABLE_DEPRECATED
@@ -33,7 +33,7 @@
 #ifndef __GTK_CTREE_H__
 #define __GTK_CTREE_H__
 
-#include <gtk/gtk.h>
+#include <gtk/gtkclist.h>
 
 G_BEGIN_DECLS